Dont iterate the display if there's nothing to write

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 378fbea135f8e28f5e0935f82055c308c9488392..86a36f07c3bd0ab131d749f5c7cc35a5b0024814 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -490,8 +490,8 @@ gdk_wayland_display_flush (GdkDisplay *display)
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
   if (!display->closed)
-    wl_display_iterate(GDK_DISPLAY_WAYLAND (display)->wl_display,
-                      WL_DISPLAY_WRITABLE);
+    _gdk_wayland_display_flush (display,
+                               GDK_DISPLAY_WAYLAND (display)->event_source);
 }
 
 static gboolean

diff --git a/gdk/wayland/gdkeventsource.c b/gdk/wayland/gdkeventsource.c
index 12c9118201de46027f7d6b6425f16eca2c233b8e..553cc35804365e185796257a5d34c9d96990bbc6 100644 (file)
--- a/gdk/wayland/gdkeventsource.c
+++ b/gdk/wayland/gdkeventsource.c
@@ -150,6 +150,16 @@ _gdk_wayland_display_event_source_new (GdkDisplay *display)
   return source;
 }
 
+void
+_gdk_wayland_display_flush (GdkDisplay *display, GSource *source)
+{
+  GdkWaylandEventSource *wayland_source = (GdkWaylandEventSource *) source;
+
+  while (wayland_source->mask & WL_DISPLAY_WRITABLE)
+    wl_display_iterate(GDK_DISPLAY_WAYLAND (display)->wl_display,
+                      WL_DISPLAY_WRITABLE);
+}
+
 void
 _gdk_wayland_display_queue_events (GdkDisplay *display)
 {

diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index fa3b27861e544402fa09084b85a8106835877547..ef13fea1baf66c519be2580172603d0e1d940c5d 100644 (file)
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -121,6 +121,7 @@ GdkDeviceManager *_gdk_device_manager_new (GdkDisplay *display);
 void     _gdk_wayland_display_deliver_event (GdkDisplay *display, GdkEvent *event);
 GSource *_gdk_wayland_display_event_source_new (GdkDisplay *display);
 void     _gdk_wayland_display_queue_events (GdkDisplay *display);
+void     _gdk_wayland_display_flush (GdkDisplay *display, GSource *source);
 
 GdkAppLaunchContext *_gdk_wayland_display_get_app_launch_context (GdkDisplay *display);